Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 28 Jan 2010 07:06:13 +0000 (08:06 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 28 Jan 2010 07:06:13 +0000 (08:06 +0100)
commit8dd695c50fd61a6873d956b8f756fbf463f1cbdd
treee0d9376712896d34df9bb5d91154574ee0e153e5
parent9e63631e92439b05d4f4217493187657f511e0bf
parentb0da618484ae04ac6a6e43bb4b2239850f8c6821
Merge from trunk